merge?

diff --cc .hgignore
index a142796726c8899639e6c8be2c0cd32eb71ab312,a142796726c8899639e6c8be2c0cd32eb71ab312..70e5f253a37106b2edb03c6ba7df1734ad8789e3
--- 1/.hgignore
--- 2/.hgignore
+++ b/.hgignore
@@@ -10,6 -10,6 +10,7 @@@
  .*\.tar\.bz2$
  .*\.tar\.gz$
  .*~$
++^build.*$
  ^dist/.*$
  ^docs/.*\.aux$
  ^docs/.*\.dvi$

diff --cc Config.mk
index 4a85a103ed153c31cc32899f53e39e2c4387e895,4a85a103ed153c31cc32899f53e39e2c4387e895..8320d3dd9a76dfe57aeb1da2c91d912dfe690f56
--- 1/Config.mk
--- 2/Config.mk
+++ b/Config.mk
@@@ -3,7 -3,7 +3,7 @@@
  # Currently supported architectures: x86_32, x86_64
  XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
  XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
--XEN_TARGET_X86_PAE  ?= n
++XEN_TARGET_X86_PAE  ?= y
  
  # Tools to run on system hosting the build
  HOSTCC     = gcc

diff --cc buildconfigs/mk.linux-2.6-xen
index 16e7e9d281c0a561924ac4e120f0eec0a71adbaa,16e7e9d281c0a561924ac4e120f0eec0a71adbaa..2cb639585d65d15271738f37d772e6d31aaeb8fe
--- 1/buildconfigs/mk.linux-2.6-xen
--- 2/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@@ -6,7 -6,7 +6,8 @@@ LINUX_VER    = 2.6.1
  
  EXTRAVERSION ?= xen
  
--LINUX_DIR    = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
++LINUX_SRCDIR = $(OS)-$(LINUX_VER)-xen
++LINUX_DIR    = build-$(OS)-$(LINUX_VER)-$(EXTRAVERSION)_$(XEN_TARGET_ARCH)
  
  include buildconfigs/Rules.mk
  
@@@ -20,25 -20,25 +21,32 @@@ build: $(LINUX_DIR)/include/linux/autoc
        fi
        $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_PATH=$(DESTDIR) install
  
--$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
--      rm -rf $(LINUX_DIR)
--      cp -al $(<D) $(LINUX_DIR)
++$(LINUX_SRCDIR)/.valid-src: ref-$(OS)-$(LINUX_VER)/.valid-ref
++      rm -rf $(LINUX_SRCDIR)
++      cp -al $(<D) $(LINUX_SRCDIR)
        # Apply arch-xen patches
        ( cd linux-$(LINUX_SERIES)-xen-sparse ; \
--          LINUX_ARCH=$(LINUX_ARCH) ./mkbuildtree ../$(LINUX_DIR) )
++          LINUX_ARCH=$(LINUX_ARCH) ./mkbuildtree ../$(LINUX_SRCDIR) )
++      # Patch kernel Makefile to set EXTRAVERSION
++      ( cd $(LINUX_SRCDIR) ; \
++        sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)/' \
++            -e 's,^KERNELRELEASE=,XENGUEST := $$(shell [ -r $$(objtree)/.xenguest ] \&\& cat $$(objtree)/.xenguest)\n&,' Makefile >Mk.tmp ; \
++        rm -f Makefile ; mv Mk.tmp Makefile )
++      touch $@
++
++$(LINUX_DIR)/include/linux/autoconf.h: $(LINUX_SRCDIR)/.valid-src
++      rm -rf $(LINUX_DIR)
++      mkdir -p $(LINUX_DIR)
        # Re-use config from install dir if one exits else use default config
--      CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
++      CONFIG_VERSION=$$(sed -ne 's/$$(XENGUEST)//; s/^EXTRAVERSION = //p' $(LINUX_SRCDIR)/Makefile); \
        [ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
          cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
--        || cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
++        || cp $(LINUX_SRCDIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(XEN_TARGET_ARCH) \
                $(LINUX_DIR)/.config
        # See if we need to munge config to enable PAE
        $(MAKE) CONFIG_FILE=$(LINUX_DIR)/.config -f buildconfigs/Rules.mk config-update-pae
--      # Patch kernel Makefile to set EXTRAVERSION
--      ( cd $(LINUX_DIR) ; \
--        sed -e 's/^EXTRAVERSION.*/&$$(XENGUEST)\nXENGUEST = -$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
--        rm -f Makefile ; mv Mk.tmp Makefile )
--      $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) oldconfig
++      echo "-$(EXTRAVERSION)" >$(LINUX_DIR)/.xenguest
++      $(MAKE) -C $(LINUX_SRCDIR) ARCH=$(LINUX_ARCH) oldconfig O=$$(/bin/pwd)/$(LINUX_DIR)
  
  prep: $(LINUX_DIR)/include/linux/autoconf.h